From: Scott Bradford <scott@scottbradford.us>
Date: Tue, 19 Apr 2016 18:45:16 +0000 (-0400)
Subject: switch back to NEWLINE (due to line ending issue); modify test to use iconv and make... 
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~9^2~24^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8a026dde76ee2285488fdad9758e1797f9113bfc;p=gpsbabel.git

switch back to NEWLINE (due to line ending issue); modify test to use iconv and make the write comparison in UTF-8.
---

diff --git a/internal_styles.cc b/internal_styles.cc
index 9352c4244..0fc0c324a 100644
--- a/internal_styles.cc
+++ b/internal_styles.cc
@@ -748,7 +748,7 @@ static char igoprimo_poi[] =
   "# FILE LAYOUT DEFINITIONS:\n"
   "#\n"
   "FIELD_DELIMITER		PIPE\n"
-  "RECORD_DELIMITER    CRNEWLINE\n"
+  "RECORD_DELIMITER    NEWLINE\n"
   "BADCHARS		\"|\n"
   "ENCODING		UTF-16LE\n"
   "#\n"
diff --git a/style/igoprimo_poi.style b/style/igoprimo_poi.style
index b53da5be4..d19224877 100644
--- a/style/igoprimo_poi.style
+++ b/style/igoprimo_poi.style
@@ -11,7 +11,7 @@ DATATYPE		WAYPOINT
 # FILE LAYOUT DEFINITIONS:
 #
 FIELD_DELIMITER		PIPE
-RECORD_DELIMITER	CRNEWLINE
+RECORD_DELIMITER	NEWLINE
 BADCHARS		"|
 ENCODING		UTF-16LE
 #
diff --git a/testo.d/igoprimo_poi.test b/testo.d/igoprimo_poi.test
index e91df18c4..481c70e76 100644
--- a/testo.d/igoprimo_poi.test
+++ b/testo.d/igoprimo_poi.test
@@ -5,5 +5,8 @@ gpsbabel -i igoprimo_poi -f ${REFERENCE}/igoprimo_poi.upoi -o gpx -F ${TMPDIR}/i
 compare ${REFERENCE}/igoprimo_poi~upoi.gpx ${TMPDIR}/igoprimo_poi~upoi.gpx
 gpsbabel -i igoprimo_poi -f ${REFERENCE}/igoprimo_poi.upoi -o unicsv -F ${TMPDIR}/igoprimo_poi~upoi.ucsv
 compare ${REFERENCE}/igoprimo_poi~upoi.ucsv ${TMPDIR}/igoprimo_poi~upoi.ucsv
-gpsbabel -i unicsv -f ${TMPDIR}/igoprimo_poi~upoi.ucsv -o igoprimo_poi -F ${TMPDIR}/igoprimo_poi~upoi~ucsv.upoi
-compare ${REFERENCE}/igoprimo_poi.upoi ${TMPDIR}/igoprimo_poi~upoi~ucsv.upoi
+
+gpsbabel -i igoprimo_poi -f ${REFERENCE}/igoprimo_poi.upoi -o igoprimo_poi -F ${TMPDIR}/igoprimo_poi~upoi.upoi
+iconv -f UTF-16LE -t UTF-8 ${REFERENCE}/igoprimo_poi.upoi >${TMPDIR}/igoprimo_poi.upoi.utf8
+iconv -f UTF-16LE -t UTF-8 ${TMPDIR}/igoprimo_poi~upoi.upoi >${TMPDIR}/igoprimo_poi~upoi.upoi.utf8
+compare ${TMPDIR}/igoprimo_poi~upoi.upoi.utf8 ${TMPDIR}/igoprimo_poi~upoi.upoi.utf
\ No newline at end of file